Skip to content

Sync branch 2.6 to main#15065

Merged
acolombier merged 48 commits into
mixxxdj:mainfrom
acolombier:sync-branch-2.6-to-main
Jul 2, 2025
Merged

Sync branch 2.6 to main#15065
acolombier merged 48 commits into
mixxxdj:mainfrom
acolombier:sync-branch-2.6-to-main

Conversation

@acolombier
Copy link
Copy Markdown
Member

No description provided.

JoergAtGithub and others added 30 commits May 25, 2025 13:22
…2022_runner_image

Update 2.5 to windows2022 runner image
(fix/feat) Traktor Kontrol S4 Mk3: tempo offset per deck
This additional condition doesn't harm my use cases

Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
…ware/mixxxdj/mixxx2-6/. Compile QM files out of TS files that are used by the localized app
…ware/mixxxdj/mixxx2-5/. Compile QM files out of TS files that are used by the localized app
Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
Fix wrong variable use syntax in condition
Unified directory seperator between BUILDENV_BASEPATH and BUILDENV_NAME
Inhibited warnings about unused external specified variables if the buildenv is already there
…ildenv_zip

Move download, SHA256 check and unzip of Windows buildenv from windows_buildenv.bat to CMakelists.txt
(fix) Pref Broadcast: make setting string translatable
…eform-channel-visibility

fix(stem): improve waveform channel visibility
…-host-triplet

ci(2.5): remove all VCPKG_DEFAULT_HOST_TRIPLET entries from build.yml
…ildenv_zip_macos

macOS: Use same CMake internal buildenv download/unzip as for Windows
daschuer and others added 18 commits June 29, 2025 01:11
(fix) Track Info dialog: restore column stretching
This keeps workflows reusable workflows readable without following renaming in the caller. It also allows quickly using the work flow directly without renaming. It will be easier to maintain in case of renaming or adding secrets in the GitHub config.
Handle the different drives (C: vs. D:) for the build directory in these two GitHub runner images
…ci-on-fork

ci(branch): allow running CI on fork branch without PR
Fix WiX error log file generation in GitHub workflow
Don't rename secrets when passing them to reusable workflows
chore(sync-branches): fix regression preventing trigger
chore(sync-branches): fix regression preventing trigger
@github-actions github-actions Bot added controller mappings library ui build preferences waveform developer experience Issues, bugs and PRs related to the development process, development environment & developer docs labels Jul 1, 2025
@acolombier acolombier merged commit 900aed9 into mixxxdj:main Jul 2, 2025
16 checks passed
@acolombier acolombier deleted the sync-branch-2.6-to-main branch July 2, 2025 00:11
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 2, 2025

Thank you for taking care of this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build controller mappings developer experience Issues, bugs and PRs related to the development process, development environment & developer docs library preferences ui waveform

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants